Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 22 Jan 2011 05:52:29 +0000 (21:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 22 Jan 2011 05:52:29 +0000 (21:52 -0800)
commitb3cb003967c9efd04c0d15124d30fefd8b47c023
treed0308a491ea2e37f1c4a32c201b3dcf1ce98d4b1
parent95d05493adf168b11d6fe0db57e505b049aaaf18
parentfdae37dca02b945180f18e0b406a8f0bf44854e7
Merge from mainline.